Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 17:34:50 +0000 (09:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 17:34:50 +0000 (09:34 -0800)

Trivial merge